menu: Free gadgets in finalize
authorMatthias Clasen <mclasen@redhat.com>
Sun, 5 Jun 2016 23:34:30 +0000 (19:34 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Mon, 6 Jun 2016 00:00:43 +0000 (20:00 -0400)
This is the right place to do this.

gtk/gtkmenu.c

index 5bc8501bbd0fd6cbe93e76bc01901dff99c09568..8531cf7080793fba21f7c55c373871844166cf5f 100644 (file)
@@ -214,6 +214,7 @@ static void     gtk_menu_get_property      (GObject          *object,
                                             guint             prop_id,
                                             GValue           *value,
                                             GParamSpec       *pspec);
+static void     gtk_menu_finalize          (GObject          *object);
 static void     gtk_menu_set_child_property(GtkContainer     *container,
                                             GtkWidget        *child,
                                             guint             property_id,
@@ -511,6 +512,7 @@ gtk_menu_class_init (GtkMenuClass *class)
   
   gobject_class->set_property = gtk_menu_set_property;
   gobject_class->get_property = gtk_menu_get_property;
+  gobject_class->finalize = gtk_menu_finalize;
 
   widget_class->destroy = gtk_menu_destroy;
   widget_class->realize = gtk_menu_realize;
@@ -1208,10 +1210,19 @@ gtk_menu_destroy (GtkWidget *widget)
       priv->position_func_data_destroy = NULL;
     }
 
+  GTK_WIDGET_CLASS (gtk_menu_parent_class)->destroy (widget);
+}
+
+static void
+gtk_menu_finalize (GObject *object)
+{
+  GtkMenu *menu = GTK_MENU (object);
+  GtkMenuPrivate *priv = menu->priv;
+
   g_clear_object (&priv->top_arrow_gadget);
   g_clear_object (&priv->bottom_arrow_gadget);
 
-  GTK_WIDGET_CLASS (gtk_menu_parent_class)->destroy (widget);
+  G_OBJECT_CLASS (gtk_menu_parent_class)->finalize (object);
 }
 
 static void